From: Keir Fraser Date: Wed, 1 Apr 2009 12:49:35 +0000 (+0100) Subject: x86: paging_log_dirty_op() should take care with invalid log_dirty.top X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13989^2~18 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a21645e1dff35eaec69f2eb9c61adeafbb16c971;p=xen.git x86: paging_log_dirty_op() should take care with invalid log_dirty.top Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 2b898dd73b..0df7376c24 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -385,13 +385,14 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } pages = 0; - l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + l4 = (mfn_valid(d->arch.paging.log_dirty.top) ? + map_domain_page(mfn_x(d->arch.paging.log_dirty.top)) : NULL); for ( i4 = 0; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++ ) { - l3 = mfn_valid(l4[i4]) ? map_domain_page(mfn_x(l4[i4])) : NULL; + l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; for ( i3 = 0; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ )